Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prerelease 23.11 #336

Merged
merged 9 commits into from
Mar 5, 2024
Merged

Prerelease 23.11 #336

merged 9 commits into from
Mar 5, 2024

Conversation

t184256
Copy link
Collaborator

@t184256 t184256 commented Mar 3, 2024

I give up on doing it cleanly, let's just release already before it's May.

t184256 and others added 2 commits February 17, 2024 12:06
This will allow extending `lib` using:

```
_modules.args.lib = ...
```

Without this the extended lib is not available to home-manager modules.
@Gerschtli
Copy link
Collaborator

fakedroid seems to be broken.. I will test the new bootstrap on my device, did you push that bootstrap.zip somewhere already?

@t184256
Copy link
Collaborator Author

t184256 commented Mar 3, 2024

@t184256
Copy link
Collaborator Author

t184256 commented Mar 3, 2024

6bccf0a passes on-device and fails on NixOS+fakedroid. so far no idea why shm would be broken in fakedroid, as the entire /dev/ is mounted over

@Gerschtli
Copy link
Collaborator

The issue with the missing profile.lock is caused by NixOS/nix#5226. A workaround is

diff --git c/pkgs/bootstrap.nix i/pkgs/bootstrap.nix
index 7e76299..f7ea097 100644
--- c/pkgs/bootstrap.nix
+++ i/pkgs/bootstrap.nix
@@ -3,7 +3,8 @@
 { runCommand, nixDirectory, prootTermux, bash, pkgs, config, initialPackageInfo }:

 runCommand "bootstrap" { } ''
-  mkdir --parents $out/{.l2s,bin,dev/shm,etc,nix,root,tmp,usr/{bin,lib}}
+  mkdir --parents $out/{.l2s,bin,dev/shm,etc,root,tmp,usr/{bin,lib}}
+  mkdir --parents $out/nix/var/nix/{profiles,gcroots}/per-user/nix-on-droid

   cp --recursive ${nixDirectory}/store $out/nix/store
   cp --recursive ${nixDirectory}/var $out/nix/var

@t184256
Copy link
Collaborator Author

t184256 commented Mar 3, 2024

shm issue seems to be an interplay with link2symlink, as the shm file gets linked around across different names. I guess I'm gonna drop link2symlink in fakedroid

@t184256
Copy link
Collaborator Author

t184256 commented Mar 3, 2024

Incorporated both changes, let's see what the CI thinks...

@t184256
Copy link
Collaborator Author

t184256 commented Mar 3, 2024

whoa, CI sure is slow today

@t184256
Copy link
Collaborator Author

t184256 commented Mar 5, 2024

OK, please review.

If the CI keeps being that unreliable, I think I'll configure a $1 VPS as a self-hosted runner or something. =/

Copy link
Collaborator

@Gerschtli Gerschtli left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tested it on my device, works like a charm, thank you!

}

function doSwitch() {
if [[ -e "$HOME/.config/nix-on-droid/flake.nix" && -z "${FLAKE_CONFIG_URI}" ]]; then

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@t184256 Couldn't we run just add the option automatically in this case, or would that break some workflows?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That'd change the default for those who have both configs, I guess.

I'm OK with the default being non-flake while flakes are experimental. We can sure flip it when the bright flake future (c)(tm) finally comes.

@t184256 t184256 merged commit 8bcabf2 into master Mar 5, 2024
15 of 16 checks passed
@t184256
Copy link
Collaborator Author

t184256 commented Mar 5, 2024

Thank you for the review and testing!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants